Include files outside of the extern "C" block. Makes some C++ compiler

2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
	gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
	gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
	gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
	gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
	gtk/gtktypeutils.h: Include files outside of the extern "C"
	block. Makes some C++ compiler happy. Reported by Denis Vakatov
	<vakatov@peony.nlm.nih.gov>.

	I really hope not to have caused a merging nightmare for all
	the branches out there. Otherwise I'll be available for crucifixion.

diff --git a/ChangeLog b/ChangeLog
index 022dad334f45b0ea06996721ec0a04a8a8530310..f7e61ef416983b9270db415155b6a09067d14ede 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
+       gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
+       gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
+       gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
+       gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
+       gtk/gtktypeutils.h: Include files outside of the extern "C"
+       block. Makes some C++ compiler happy. Reported by Denis Vakatov
+       <vakatov@peony.nlm.nih.gov>.
+
 Wed Jul 19 14:07:57 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/tutorial/gtk-tut.sgml: Yet more clean ups.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 022dad334f45b0ea06996721ec0a04a8a8530310..f7e61ef416983b9270db415155b6a09067d14ede 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
+       gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
+       gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
+       gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
+       gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
+       gtk/gtktypeutils.h: Include files outside of the extern "C"
+       block. Makes some C++ compiler happy. Reported by Denis Vakatov
+       <vakatov@peony.nlm.nih.gov>.
+
 Wed Jul 19 14:07:57 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/tutorial/gtk-tut.sgml: Yet more clean ups.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 022dad334f45b0ea06996721ec0a04a8a8530310..f7e61ef416983b9270db415155b6a09067d14ede 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
+       gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
+       gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
+       gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
+       gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
+       gtk/gtktypeutils.h: Include files outside of the extern "C"
+       block. Makes some C++ compiler happy. Reported by Denis Vakatov
+       <vakatov@peony.nlm.nih.gov>.
+
 Wed Jul 19 14:07:57 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/tutorial/gtk-tut.sgml: Yet more clean ups.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 022dad334f45b0ea06996721ec0a04a8a8530310..f7e61ef416983b9270db415155b6a09067d14ede 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
+       gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
+       gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
+       gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
+       gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
+       gtk/gtktypeutils.h: Include files outside of the extern "C"
+       block. Makes some C++ compiler happy. Reported by Denis Vakatov
+       <vakatov@peony.nlm.nih.gov>.
+
 Wed Jul 19 14:07:57 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/tutorial/gtk-tut.sgml: Yet more clean ups.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 022dad334f45b0ea06996721ec0a04a8a8530310..f7e61ef416983b9270db415155b6a09067d14ede 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
+       gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
+       gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
+       gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
+       gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
+       gtk/gtktypeutils.h: Include files outside of the extern "C"
+       block. Makes some C++ compiler happy. Reported by Denis Vakatov
+       <vakatov@peony.nlm.nih.gov>.
+
 Wed Jul 19 14:07:57 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/tutorial/gtk-tut.sgml: Yet more clean ups.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 022dad334f45b0ea06996721ec0a04a8a8530310..f7e61ef416983b9270db415155b6a09067d14ede 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
+       gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
+       gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
+       gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
+       gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
+       gtk/gtktypeutils.h: Include files outside of the extern "C"
+       block. Makes some C++ compiler happy. Reported by Denis Vakatov
+       <vakatov@peony.nlm.nih.gov>.
+
 Wed Jul 19 14:07:57 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/tutorial/gtk-tut.sgml: Yet more clean ups.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 022dad334f45b0ea06996721ec0a04a8a8530310..f7e61ef416983b9270db415155b6a09067d14ede 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+2000-07-19  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * gdk-pixbuf/gdk-pixbuf.h, gtk/gtkhsv.h, gtk/gtktextbtree.h,
+       gtk/gtktextbuffer.h, gtk/gtktextchild.h, gtk/gtktextdisplay.h,
+       gtk/gtktextiter.h, gtk/gtktextiterprivate.h, gtk/gtktextlayout.h,
+       gtk/gtktextmarkprivate.h, gtk/gtktextsegment.h, gtk/gtktexttag.h,
+       gtk/gtktexttagtable.h, gtk/gtktexttypes.h, gtk/gtktextview.h,
+       gtk/gtktypeutils.h: Include files outside of the extern "C"
+       block. Makes some C++ compiler happy. Reported by Denis Vakatov
+       <vakatov@peony.nlm.nih.gov>.
+
 Wed Jul 19 14:07:57 BST 2000  Tony Gale <gale@gtk.org>
 
        * docs/tutorial/gtk-tut.sgml: Yet more clean ups.

diff --git a/gdk-pixbuf/gdk-pixbuf.h b/gdk-pixbuf/gdk-pixbuf.h
index 04756b5b817dad14ed0a0231f7d7cb23463dcdb8..ab87b9e7c5c422eebcf4e2e990b0c8aa7815aa1d 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf.h
+++ b/gdk-pixbuf/gdk-pixbuf.h
@@ -26,14 +26,14 @@
 #ifndef GDK_PIXBUF_H
 #define GDK_PIXBUF_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #include <glib.h>
 #include <gdk-pixbuf/gdk-pixbuf-features.h>
 #include <gobject/gobject.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 \f
 
 /* Color spaces; right now only RGB is supported */

diff --git a/gtk/gtkhsv.h b/gtk/gtkhsv.h
index 396821bed3d475d22dac8712a720fdb85b3c4dd7..2ca8c24ac04498c3d3274a3a581e5e8962c7276d 100644 (file)
--- a/gtk/gtkhsv.h
+++ b/gtk/gtkhsv.h
@@ -31,14 +31,12 @@
  * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
+#include <gtk/gtkwidget.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include <gtk/gtkwidget.h>
-
-
 #define GTK_TYPE_HSV            (gtk_hsv_get_type ())
 #define GTK_HSV(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_HSV, GtkHSV))
 #define GTK_HSV_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_HSV, GtkHSV))

diff --git a/gtk/gtktextbtree.h b/gtk/gtktextbtree.h
index 0c594c3c85a404de5b1c580c9f711ab1fbe8fa82..72085302ed82bd96d1f45a8eb1722e145bad6887 100644 (file)
--- a/gtk/gtktextbtree.h
+++ b/gtk/gtktextbtree.h
@@ -1,10 +1,6 @@
 #ifndef GTK_TEXT_BTREE_H
 #define GTK_TEXT_BTREE_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktexttag.h>
 #include <gtk/gtktextmark.h>
@@ -12,6 +8,9 @@ extern "C" {
 #include <gtk/gtktextsegment.h>
 #include <gtk/gtktextiter.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
 
 GtkTextBTree  *gtk_text_btree_new        (GtkTextTagTable *table,
                                           GtkTextBuffer   *buffer);

diff --git a/gtk/gtktextbuffer.h b/gtk/gtktextbuffer.h
index c57354b17bf0404eba9998015c17e8263950955a..a8ef0eb65196cdbdbe57dfc464ed914bc388a0f5 100644 (file)
--- a/gtk/gtktextbuffer.h
+++ b/gtk/gtktextbuffer.h
@@ -1,6 +1,11 @@
 #ifndef GTK_TEXT_BUFFER_H
 #define GTK_TEXT_BUFFER_H
 
+#include <gtk/gtkwidget.h>
+#include <gtk/gtktexttagtable.h>
+#include <gtk/gtktextiter.h>
+#include <gtk/gtktextmark.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -10,11 +15,6 @@ extern "C" {
  * GtkTextBTree is the PRIVATE internal representation of it.
  */
 
-#include <gtk/gtkwidget.h>
-#include <gtk/gtktexttagtable.h>
-#include <gtk/gtktextiter.h>
-#include <gtk/gtktextmark.h>
-
 typedef struct _GtkTextBTree GtkTextBTree;
 
 #define GTK_TYPE_TEXT_BUFFER            (gtk_text_buffer_get_type())

diff --git a/gtk/gtktextchild.h b/gtk/gtktextchild.h
index 9ce8fd5fc557d69c68a021966f7d740106d83a7e..3344a5a8d4118b0bca67233b7f1db842ca32ddcb 100644 (file)
--- a/gtk/gtktextchild.h
+++ b/gtk/gtktextchild.h
@@ -1,12 +1,12 @@
 #ifndef GTK_TEXT_CHILD_H
 #define GTK_TEXT_CHILD_H
 
+#include <gtk/gtktexttypes.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include <gtk/gtktexttypes.h>
-
 typedef struct _GtkTextPixmap GtkTextPixmap;
 
 struct _GtkTextPixmap {

diff --git a/gtk/gtktextdisplay.h b/gtk/gtktextdisplay.h
index 8f43b6da034508768626ffa825174c1800750b65..66110d127d92fe2bd518677dc0bca2a01365a08a 100644 (file)
--- a/gtk/gtktextdisplay.h
+++ b/gtk/gtktextdisplay.h
@@ -1,6 +1,8 @@
 #ifndef GTK_TEXT_DISPLAY_H
 #define GTK_TEXT_DISPLAY_H
 
+#include <gtk/gtktextlayout.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -10,8 +12,6 @@ extern "C" {
   uses GtkTextLayout
 */
 
-#include <gtk/gtktextlayout.h>
-
 /* The drawable should be pre-initialized to your preferred
    background. */
 void gtk_text_layout_draw (GtkTextLayout *layout,

diff --git a/gtk/gtktextiter.h b/gtk/gtktextiter.h
index 1b932202634f8f643286d69265654caec4ac0bca..2e86e47b0d7ae72360af1ac61a5c23a32b80ef62 100644 (file)
--- a/gtk/gtktextiter.h
+++ b/gtk/gtktextiter.h
@@ -1,6 +1,8 @@
 #ifndef GTK_TEXT_ITER_H
 #define GTK_TEXT_ITER_H
 
+#include <gtk/gtktexttag.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -11,8 +13,6 @@ extern "C" {
  * are changed.
  */
 
-#include <gtk/gtktexttag.h>
-
 typedef struct _GtkTextBuffer GtkTextBuffer;
 
 struct _GtkTextIter {

diff --git a/gtk/gtktextiterprivate.h b/gtk/gtktextiterprivate.h
index 4a83c643a616341837e610fe233969b8445ae8ae..6a23a3e8f9c926bea01a70da344e9d5f8019e4b6 100644 (file)
--- a/gtk/gtktextiterprivate.h
+++ b/gtk/gtktextiterprivate.h
@@ -1,12 +1,12 @@
 #ifndef GTK_TEXT_ITER_PRIVATE_H
 #define GTK_TEXT_ITER_PRIVATE_H
 
+#include <gtk/gtktextiter.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include <gtk/gtktextiter.h>
-
 GtkTextLineSegment *gtk_text_iter_get_indexable_segment(const GtkTextIter *iter);
 GtkTextLineSegment *gtk_text_iter_get_any_segment(const GtkTextIter *iter);
 

diff --git a/gtk/gtktextlayout.h b/gtk/gtktextlayout.h
index ffe2700608745a2e8b73e6545d3e4a53936f3a8b..457d36f929a49ee3da215799c2de24fbf1a1033b 100644 (file)
--- a/gtk/gtktextlayout.h
+++ b/gtk/gtktextlayout.h
@@ -1,6 +1,10 @@
 #ifndef GTK_TEXT_LAYOUT_H
 #define GTK_TEXT_LAYOUT_H
 
+#include <gtk/gtktextbuffer.h>
+#include <gtk/gtktextiter.h>
+#include <gtk/gtktextbtree.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -12,11 +16,6 @@ extern "C" {
  * to use it. 
  */
 
-#include <gtk/gtktextbuffer.h>
-#include <gtk/gtktextiter.h>
-#include <gtk/gtktextbtree.h>
-
-
 #define GTK_TYPE_TEXT_LAYOUT             (gtk_text_layout_get_type())
 #define GTK_TEXT_LAYOUT(obj)             (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_LAYOUT, GtkTextLayout))
 #define GTK_TEXT_LAYOUT_CLASS(klass)     (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_LAYOUT, GtkTextLayoutClass))

diff --git a/gtk/gtktextmarkprivate.h b/gtk/gtktextmarkprivate.h
index 578e68036b64e6808d3546f0d6a6713617279dac..08b64fac003a6c22cef600ba1cdf6b22823ac7ac 100644 (file)
--- a/gtk/gtktextmarkprivate.h
+++ b/gtk/gtktextmarkprivate.h
@@ -1,13 +1,12 @@
 #ifndef GTK_TEXT_MARK_PRIVATE_H
 #define GTK_TEXT_MARK_PRIVATE_H
 
+#include <gtk/gtktexttypes.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include <gtk/gtktexttypes.h>
-
-
 #define GTK_IS_TEXT_MARK(mark) (((GtkTextLineSegment*)mark)->type == &gtk_text_left_mark_type || \
                                 ((GtkTextLineSegment*)mark)->type == &gtk_text_right_mark_type)
 

diff --git a/gtk/gtktextsegment.h b/gtk/gtktextsegment.h
index d3fe77e82a34969cd4604ae666427c88d696da1a..4d2d99a784bafc184eb680a196338be414160742 100644 (file)
--- a/gtk/gtktextsegment.h
+++ b/gtk/gtktextsegment.h
@@ -1,6 +1,11 @@
 #ifndef GTK_TEXT_SEGMENT_H
 #define GTK_TEXT_SEGMENT_H
 
+#include <gtk/gtktexttag.h>
+#include <gtk/gtktextiter.h>
+#include <gtk/gtktextmarkprivate.h>
+#include <gtk/gtktextchild.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
@@ -15,11 +20,6 @@ extern "C" {
 /* This header has the segment type, and two specific segments
    (character and toggle segments) */
 
-#include <gtk/gtktexttag.h>
-#include <gtk/gtktextiter.h>
-#include <gtk/gtktextmarkprivate.h>
-#include <gtk/gtktextchild.h>
-
 /* Information a BTree stores about a tag. */
 typedef struct _GtkTextTagInfo GtkTextTagInfo;
 struct _GtkTextTagInfo {

diff --git a/gtk/gtktexttag.h b/gtk/gtktexttag.h
index 6fed3c7d71e35d8ec2a2076b79c105b7f59277a1..7fac2e185fa89ee0f7fabbd61f1f868867497c90 100644 (file)
--- a/gtk/gtktexttag.h
+++ b/gtk/gtktexttag.h
@@ -1,13 +1,13 @@
 #ifndef GTK_TEXT_TAG_H
 #define GTK_TEXT_TAG_H
 
+#include <gtk/gtkobject.h>
+#include <gdk/gdk.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include <gtk/gtkobject.h>
-#include <gdk/gdk.h>
-
 typedef struct _GtkTextIter GtkTextIter;
 typedef struct _GtkTextBTreeNode GtkTextBTreeNode;
 typedef struct _GtkTextTagTable GtkTextTagTable;

diff --git a/gtk/gtktexttagtable.h b/gtk/gtktexttagtable.h
index 6624b60abfb069978afc031c5c27f0703e8d4bbc..fee66bd722b16751669eda89746e00bfc12b40c9 100644 (file)
--- a/gtk/gtktexttagtable.h
+++ b/gtk/gtktexttagtable.h
@@ -1,12 +1,12 @@
 #ifndef GTK_TEXT_TAG_TABLE_H
 #define GTK_TEXT_TAG_TABLE_H
 
+#include <gtk/gtktexttag.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 
-#include <gtk/gtktexttag.h>
-
 #define GTK_TYPE_TEXT_TAG_TABLE            (gtk_text_tag_table_get_type())
 #define GTK_TEXT_TAG_TABLE(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTable))
 #define GTK_TEXT_TAG_TABLE_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_TEXT_TAG_TABLE, GtkTextTagTableClass))

diff --git a/gtk/gtktexttypes.h b/gtk/gtktexttypes.h
index 65c3cf06533f530e613e7ababa7ca0262fa494f8..19d72a12091b5dfe5027793d86949b11e83a197f 100644 (file)
--- a/gtk/gtktexttypes.h
+++ b/gtk/gtktexttypes.h
@@ -1,15 +1,15 @@
 #ifndef GTK_TEXT_TYPES_H
 #define GTK_TEXT_TYPES_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <glib.h>
 
 #include <gtk/gtktextbuffer.h>
 #include <gtk/gtktexttagprivate.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 typedef struct _GtkTextLine GtkTextLine;
 typedef struct _GtkTextCounter GtkTextCounter;
 typedef struct _GtkTextLineSegment GtkTextLineSegment;

diff --git a/gtk/gtktextview.h b/gtk/gtktextview.h
index 002d3cd01fd71879f575e519f71c146342f8f02c..8af1a9e7f12308feef4d310f55378da02ccd69ed 100644 (file)
--- a/gtk/gtktextview.h
+++ b/gtk/gtktextview.h
@@ -1,14 +1,14 @@
 #ifndef GTK_TEXT_VIEW_H
 #define GTK_TEXT_VIEW_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkimcontext.h>
 #include <gtk/gtktextbuffer.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 typedef enum {
   GTK_TEXT_MOVEMENT_CHAR,       /* move by forw/back chars */
   GTK_TEXT_MOVEMENT_POSITIONS,  /* move by left/right chars */

diff --git a/gtk/gtktypeutils.h b/gtk/gtktypeutils.h
index bb84258debd556b53e295cae4ec883cefe1fca9d..528c4f3b87db65014eb0d157ac657d6d17e1fbeb 100644 (file)
--- a/gtk/gtktypeutils.h
+++ b/gtk/gtktypeutils.h
@@ -95,10 +95,18 @@ typedef GBaseInitFunc               GtkClassInitFunc;
 typedef GInstanceInitFunc      GtkObjectInitFunc;
 
 
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
 /* Builtin Types
  */
 #include <gtk/gtktypebuiltins.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 
 /* --- typedefs --- */
 /* here we come with some necessary forward declarations for structures and